bitkeeper revision 1.1159.1.186 (41576677S5QEgpnRR53rt-wqZY63Kw)

Revert some annoying 2.4 config changes.

diff --git a/linux-2.4.27-xen-sparse/arch/xen/config.in b/linux-2.4.27-xen-sparse/arch/xen/config.in
index 2ed848d505c511d1dd796685fbd123d14421f512..231612959a34f8d1ce4e0aa36401bf5131c0962b 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/config.in
+++ b/linux-2.4.27-xen-sparse/arch/xen/config.in
@@ -25,14 +25,10 @@ define_bool CONFIG_NO_IDLE_HZ y
 
 if [ "$CONFIG_XEN_PHYSDEV_ACCESS" == "y" ]; then
    define_bool CONFIG_FOREIGN_PAGES y
-   define_bool CONFIG_XEN_BLKDEV_FRONTEND n
-   define_bool CONFIG_XEN_NETDEV_FRONTEND n
 else
    define_bool CONFIG_FOREIGN_PAGES n
    define_bool CONFIG_NETDEVICES y
    define_bool CONFIG_VT n
-   define_bool CONFIG_XEN_BLKDEV_FRONTEND y
-   define_bool CONFIG_XEN_NETDEV_FRONTEND y
 fi
 
 mainmenu_option next_comment

diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0
index fac68182d1314ff4a2bad2756bc85dff1b60e337..44a4e87ef734dfc6f9046b5f3ffde8a8f5b42c3d 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0
+++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0
@@ -219,7 +219,7 @@ CONFIG_IP_NF_TARGET_ULOG=y
 #
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 

diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
index 6e66c3c9af7adfc36798801d0fedd333ca7a2c60..2842481292dbe19a154fbef13c03a67a667cba53 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
+++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
@@ -17,8 +17,6 @@ CONFIG_UID16=y
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_NO_IDLE_HZ=y
 # CONFIG_FOREIGN_PAGES is not set
 CONFIG_NETDEVICES=y
@@ -157,7 +155,7 @@ CONFIG_IP_NF_TARGET_ULOG=y
 #
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set